From b010d6c68edcd9a057310240a97de6186db12437 Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Fri, 15 Jun 2007 11:50:54 +0100 Subject: [PATCH] Make Xen headers lint-clean, and fix xs_wire.h for Solaris compiler. Signed-off-by: John Levon Signed-off-by: Ryan Scott --- xen/include/public/io/ring.h | 2 +- xen/include/public/io/xs_wire.h | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/xen/include/public/io/ring.h b/xen/include/public/io/ring.h index 704460b599..355eba5545 100644 --- a/xen/include/public/io/ring.h +++ b/xen/include/public/io/ring.h @@ -133,7 +133,7 @@ typedef struct __name##_back_ring __name##_back_ring_t #define SHARED_RING_INIT(_s) do { \ (_s)->req_prod = (_s)->rsp_prod = 0; \ (_s)->req_event = (_s)->rsp_event = 1; \ - memset((_s)->pad, 0, sizeof((_s)->pad)); \ + (void)memset((_s)->pad, 0, sizeof((_s)->pad)); \ } while(0) #define FRONT_RING_INIT(_r, _s, __size) do { \ diff --git a/xen/include/public/io/xs_wire.h b/xen/include/public/io/xs_wire.h index 009a53be4b..927ed8c944 100644 --- a/xen/include/public/io/xs_wire.h +++ b/xen/include/public/io/xs_wire.h @@ -60,7 +60,11 @@ struct xsd_errors const char *errstring; }; #define XSD_ERROR(x) { x, #x } -static struct xsd_errors xsd_errors[] __attribute__((unused)) = { +static struct xsd_errors xsd_errors[] +#if defined(__GNUC__) +__attribute__((unused)) +#endif + = { XSD_ERROR(EINVAL), XSD_ERROR(EACCES), XSD_ERROR(EEXIST), -- 2.30.2